projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8aa77c0
)
Fix 32bit PAE compilation error introduced by 1GB patches
author
Keir Fraser
<keir.fraser@citrix.com>
Wed, 7 Apr 2010 07:15:33 +0000
(08:15 +0100)
committer
Keir Fraser
<keir.fraser@citrix.com>
Wed, 7 Apr 2010 07:15:33 +0000
(08:15 +0100)
Signed-off-by: Wei Huang2 <wei.huang2@amd.com>
xen/arch/x86/mm/p2m.c
patch
|
blob
|
history
diff --git
a/xen/arch/x86/mm/p2m.c
b/xen/arch/x86/mm/p2m.c
index 7bb904d395eb9b1278603d66ee4555e51f015047..ba6f191d8b0845b0b101d873dbdbcfa83df81c12 100644
(file)
--- a/
xen/arch/x86/mm/p2m.c
+++ b/
xen/arch/x86/mm/p2m.c
@@
-1534,12
+1534,15
@@
static mfn_t p2m_gfn_to_mfn_current(unsigned long gfn, p2m_type_t *t,
{
l1_pgentry_t l1e = l1e_empty(), *p2m_entry;
l2_pgentry_t l2e = l2e_empty();
- l3_pgentry_t l3e = l3e_empty();
int ret;
+#if CONFIG_PAGING_LEVELS >= 4
+ l3_pgentry_t l3e = l3e_empty();
+#endif
ASSERT(gfn < (RO_MPT_VIRT_END - RO_MPT_VIRT_START)
/ sizeof(l1_pgentry_t));
+#if CONFIG_PAGING_LEVELS >= 4
/*
* Read & process L3
*/
@@
-1585,7
+1588,7
@@
static mfn_t p2m_gfn_to_mfn_current(unsigned long gfn, p2m_type_t *t,
goto out;
}
-
+#endif
/*
* Read & process L2
*/